From 547f1aa9adf05e301d4a060505de43c998592ff6 Mon Sep 17 00:00:00 2001
From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Wed, 27 Mar 2019 09:27:54 +0100
Subject: [PATCH] Fixed test select

---
 itest/test_select.py    |  4 +++-
 itest/test_select_ns.py | 20 +++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/itest/test_select.py b/itest/test_select.py
index 8d274764..6e3879cf 100644
--- a/itest/test_select.py
+++ b/itest/test_select.py
@@ -435,7 +435,9 @@ class TestSelect(TestBase):
                 QueryError,
                 'Memory allocation error or maximum recursion depth reached.'):
             await self.client0.query(
-                'select * from "aggr" where length > {}'.format('(' * 500))
+                'select * from {}"aggr"{}'.format(
+                    '(' * 501,
+                    ')' * 501))
 
         with self.assertRaisesRegex(
                     QueryError,
diff --git a/itest/test_select_ns.py b/itest/test_select_ns.py
index 0ab80229..b9845380 100644
--- a/itest/test_select_ns.py
+++ b/itest/test_select_ns.py
@@ -458,44 +458,44 @@ class TestSelectNano(TestBase):
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Cannot use mean\(\) on string type\.'):
+                r'Cannot use mean\(\) on string type\.'):
             await self.client0.query('select mean(1w) from "log"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Group by time must be an integer value larger than zero\.'):
+                r'Group by time must be an integer value larger than zero\.'):
             await self.client0.query('select mean(0) from "aggr"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Limit must be an integer value larger than zero\.'):
+                r'Limit must be an integer value larger than zero\.'):
             await self.client0.query('select limit(6 - 6, mean) from "aggr"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Cannot use a string filter on number type\.'):
+                r'Cannot use a string filter on number type\.'):
             await self.client0.query(
                 'select * from "aggr" '
                 'merge as "t" using filter("0")')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Cannot use difference\(\) on string type\.'):
+                r'Cannot use difference\(\) on string type\.'):
             await self.client0.query('select difference() from "log"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Cannot use derivative\(\) on string type\.'):
+                r'Cannot use derivative\(\) on string type\.'):
             await self.client0.query('select derivative(6, 3) from "log"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Cannot use derivative\(\) on string type\.'):
+                r'Cannot use derivative\(\) on string type\.'):
             await self.client0.query('select derivative() from "log"')
 
         with self.assertRaisesRegex(
                 QueryError,
-                'Overflow detected while using sum\(\)\.'):
+                r'Overflow detected while using sum\(\)\.'):
             await self.client0.query('select sum(now) from "huge"')
 
         with self.assertRaisesRegex(
@@ -514,7 +514,9 @@ class TestSelectNano(TestBase):
                 QueryError,
                 'Memory allocation error or maximum recursion depth reached.'):
             await self.client0.query(
-                'select * from "aggr" where length > {}'.format('(' * 500))
+                'select * from {}"aggr"{}'.format(
+                    '(' * 501,
+                    ')' * 501))
 
         with self.assertRaisesRegex(
                     QueryError,
-- 
2.30.2